From ff4863e038ae9c223f13f59fabbae7f46c2a3a3b Mon Sep 17 00:00:00 2001 From: "sos22@labyrinth.cl.cam.ac.uk" Date: Thu, 10 Jul 2003 08:44:44 +0000 Subject: [PATCH] bitkeeper revision 1.324 (3f0d277cpcr79eYnomJwVbvv_s1DPQ) XenoLinux shouldn't export Xen device numbers to userspace if possible; use physdev_to_xldev to convert back to XenoLinux block device numbers. --- .../arch/xeno/drivers/block/xl_physdisk_proc.c | 2 +- .../arch/xeno/drivers/block/xl_segment_proc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c index 3014b078e6..cda22db128 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c @@ -13,7 +13,7 @@ extern int xenolinux_control_msg(int operration, char *buffer, int size); extern unsigned short xldev_to_physdev(kdev_t xldev); -static dev_t physdev_to_xldev(unsigned short physdev) +dev_t physdev_to_xldev(unsigned short physdev) { switch (physdev & XENDEV_TYPE_MASK) { case XENDEV_IDE: diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c index dce8a2d4bf..ecd20acfa4 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c @@ -13,6 +13,7 @@ static struct proc_dir_entry *vhd; extern unsigned short xldev_to_physdev(kdev_t xldev); +extern dev_t physdev_to_xldev(unsigned short physdev); static void *proc_vhd_next(struct seq_file *s, void *v, loff_t *pos) { @@ -50,7 +51,7 @@ static int proc_vhd_show(struct seq_file *s, void *v) data->segments[data->count - 1].domain, data->segments[data->count - 1].seg_nr, data->segments[data->count - 1].key, - data->segments[data->count - 1].device); + physdev_to_xldev(data->segments[data->count - 1].device)); return 0; } -- 2.30.2